From: kfraser@localhost.localdomain Date: Fri, 31 Aug 2007 10:12:57 +0000 (+0100) Subject: DEFINE_XEN_GUEST_HANDLE is evaluated by the pre-processor twice. Do this also for... X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14987^2~32 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=3d030c1164e2c7bfc4873368e14bae9cc0e23e16;p=xen.git DEFINE_XEN_GUEST_HANDLE is evaluated by the pre-processor twice. Do this also for XEN_GUEST_HANDLE. This fixes a build error for PV guests (OpenBSD, NetBSD) where the use of XEN_GUEST_HANDLE(uint8_t) leads to a build error because uint8_t is a #define instead a typedef. Signed-off-by: Christoph Egger --- diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 9fe0b76204..0ef702dda7 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -37,7 +37,8 @@ #endif #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) -#define XEN_GUEST_HANDLE(name) __guest_handle_ ## name +#define __XEN_GUEST_HANDLE(name) __guest_handle_ ## name +#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name) #define set_xen_guest_handle(hnd, val) do { (hnd).p = val; } while (0) #ifdef __XEN_TOOLS__ #define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0)